wip

diff --git a/debian/.gitignore b/debian/.gitignore
index 2cd6fae63fd58a4ff30539cdf65e4f70928d48e5..b3c2ab908cd4ced11d380ce29adc4678c9687700 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,15 +1,15 @@
 __pycache__
 /build/
 /files
-/libxen-*.*/
+/libxen-[0-9].*/
 !/libxen-dev.install
 /libxen-dev/
-/libxenstore3.0/
+/libxenstore[0-9].0/
 /stamps/
-/xen-hypervisor-*.*-*/
+/xen-hypervisor-[0-9].*-*/
 /xenstore-utils/
-/xen-system-*/
-/xen-utils-*.*/
+/xen-system-[0-9]*/
+/xen-utils-[0-9]*.*/
 /xen-utils-common/
 /xen-hypervisor-common/
 *.debhelper*

diff --git a/debian/rules b/debian/rules
index 039485e7d704975e5ddb9d00a91e0ed0139146e5..517628363e63e90cac1550b801ed79f595864878 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,8 @@ SHELL    := bash -e
 # Only debian/control needs this update; all other files are made
 # from simple templates, at package build time.
 #
-upstream_version := $(shell dpkg-parsechangelog -SVersion | sed 's/\(\.[0-9]*\)\..*/\1/')
+upstream_version := \
+ $(shell dpkg-parsechangelog -SVersion | sed 's/\(\.[0-9]*\)\..*/\1/' )
 
 TEMPLATE_FILES := $(wildcard debian/*.vsn-in)
 
@@ -31,16 +32,15 @@ define template_template =
        && mv -f $$@{.tmp,}
 endef
 
-$(foreach t,$(TEMPLATE_FILES), $(eval $(call \
-       template_template, $t, \
-       $(subst V,$(upstream_version), $(basename $t)) \
+$(foreach t,$(TEMPLATE_FILES), $(eval                                  \
+       $(call                                                          \
+               template_template, $t,                                  \
+               $(subst V,$(upstream_version), $(basename $t))          \
        )))
 
 templated-files: $(TEMPLATED_FILES)
        :
 
-$(shell echo >&2 $(TEMPLATE_FILES) X $(TEMPLATED_FILES))
-
 # Work around bug in dpkg-buildpackage: between dpkg 1.14.17 and 1.16.1
 # it exports these.  This is a problem because we need to pass different
 # options to the hypervisor build - the default options from dpkg